inspector: Build nonrecursively

diff --git a/configure.ac b/configure.ac
index 90b46c21e63b08fbe187a7e0a53f6f5c60e95352..14a0c757453e9bd4155976a2a2b56fbee0bffd7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1941,7 +1941,6 @@ gtk/makefile.msc
 gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/libgtk3.manifest
-gtk/inspector/Makefile
 gtk/native/Makefile
 util/Makefile
 libgail-util/Makefile

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 43017140347f56860844c01ab72a0e5beff4c612..d9f889e879fa65e4d2d0732a31268f33bba95e9d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -18,7 +18,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = inspector native .
+SUBDIRS = native .
 if OS_DARWIN
   ECHO="echo"
 else
@@ -122,12 +122,10 @@ endif
 libgtkincludedir = $(includedir)/gtk-3.0/gtk
 libadd = \
        $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/inspector/libgtkinspector.la \
        $(GMODULE_LIBS) \
        $(GTK_DEP_LIBS)
 deps = \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/inspector/libgtkinspector.la
+       $(top_builddir)/gdk/libgdk-3.la
 
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
@@ -158,6 +156,7 @@ endif
 
 include $(srcdir)/a11y/Makefile.inc
 include $(srcdir)/deprecated/Makefile.inc
+include $(srcdir)/inspector/Makefile.inc
 
 # GTK+ header files for public installation (non-generated, or generated
 # by configure)
@@ -394,6 +393,7 @@ gtk_private_type_h_sources =        \
 
 # GTK+ header files that don't get installed
 gtk_private_h_sources =                \
+       $(inspector_h_sources)  \
        $(gtk_private_type_h_sources) \
        gtkactionmuxer.h        \
        gtkactionobserver.h     \
@@ -574,6 +574,7 @@ gtk_private_h_sources =             \
 gtk_base_c_sources =           \
        $(a11y_c_sources)       \
        $(deprecated_c_sources) \
+       $(inspector_c_sources)  \
        $(clipboard_dnd_c_sources) \
        gtkactionmuxer.c        \
        gtkactionobserver.c     \
@@ -1096,6 +1097,7 @@ pkgdata_DATA = gtkbuilder.rng
 EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng
 
 templates =                            \
+       $(inspector_templates)          \
        ui/gtkapplication-quartz.ui     \
        ui/gtkaboutdialog.ui            \
        ui/gtkactionbar.ui              \
@@ -1209,6 +1211,11 @@ gtk.gresource.xml: Makefile.am
            $(ECHO) "    <file>icons/$$s/actions/$$n</file>" >> $@; \
          done; \
        done; \
+       for f in $(srcdir)/inspector/*.ui; do \
+         n=`basename $$f`; \
+         $(ECHO) "    <file compressed=\"true\">inspector/$$n</file>" >> $@; \
+       done; \
+       $(ECHO) "    <file>inspector/logo.png</file>" >> $@; \
        $(ECHO) "  </gresource>" >> $@; \
        $(ECHO) "</gresources>" >> $@;
 
@@ -1531,6 +1538,7 @@ EXTRA_DIST +=                   \
        $(template_headers)     \
        a11y/Makefile.inc       \
        deprecated/Makefile.inc \
+       inspector/Makefile.inc  \
        libgtk3.manifest.in     \
        gtk-win32.rc.in         \
        gtkwin32embed.h         \

diff --git a/gtk/inspector/Makefile.am b/gtk/inspector/Makefile.am
deleted file mode 100644 (file)
index ff3806c..0000000
--- a/gtk/inspector/Makefile.am
+++ /dev/null
@@ -1,171 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-noinst_LTLIBRARIES = libgtkinspector.la
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/inspector.gresource.xml)
-resources.h: inspector.gresource.xml
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/inspector.gresource.xml \
-               --target=$@ --sourcedir=$(srcdir) --c-name gtk_inspector --generate-header --manual-register
-resources.c: inspector.gresource.xml $(resource_files) $(template_headers)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/inspector.gresource.xml \
-               --target=$@ --sourcedir=$(srcdir) --c-name gtk_inspector --generate-source --manual-register
-
-BUILT_SOURCES =                        \
-       resources.h                     \
-       resources.c
-
-libgtkinspector_la_SOURCES =           \
-       action-editor.h                 \
-       action-editor.c                 \
-       actions.h                       \
-       actions.c                       \
-       cellrenderergraph.h             \
-       cellrenderergraph.c             \
-       classes-list.h                  \
-       classes-list.c                  \
-       css-editor.h                    \
-       css-editor.c                    \
-       data-list.h                     \
-       data-list.c                     \
-       general.h                       \
-       general.c                       \
-       gestures.h                      \
-       gestures.c                      \
-       graphdata.h                     \
-       graphdata.c                     \
-       init.h                          \
-       init.c                          \
-       inspect-button.c                \
-       menu.h                          \
-       menu.c                          \
-       misc-info.h                     \
-       misc-info.c                     \
-       object-hierarchy.h              \
-       object-hierarchy.c              \
-       object-tree.h                   \
-       object-tree.c                   \
-       prop-editor.h                   \
-       prop-editor.c                   \
-       prop-list.h                     \
-       prop-list.c                     \
-       resource-list.h                 \
-       resource-list.c                 \
-       resources.h                     \
-       resources.c                     \
-       selector.h                      \
-       selector.c                      \
-       signals-list.h                  \
-       signals-list.c                  \
-       size-groups.h                   \
-       size-groups.c                   \
-       statistics.h                    \
-       statistics.c                    \
-       style-prop-list.h               \
-       style-prop-list.c               \
-       treewalk.h                      \
-       treewalk.c                      \
-       visual.h                        \
-       visual.c                        \
-       window.h                        \
-       window.c
-
-libgtkinspector_la_CPPFLAGS =          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/gtk             \
-       -I$(top_builddir)/gtk           \
-       -I$(top_srcdir)/gdk             \
-       -I$(top_builddir)/gdk           \
-       -DGTK_VERSION=\"$(GTK_VERSION)\"\
-       -DGTK_DATADIR=\"$(datadir)\"    \
-       -DGTK_COMPILATION               \
-       $(AM_CPPFLAGS)
-
-libgtkinspector_la_CFLAGS =            \
-       $(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-       $(GTK_DEP_CFLAGS)               \
-       $(GTK_DEBUG_FLAGS)              \
-       $(AM_CFLAGS)
-
-if USE_QUARTZ
-libgtkinspector_la_CFLAGS += "-xobjective-c"
-endif # USE_QUARTZ
-
-libgtkinspector_la_LIBADD =            \
-       $(GTK_DEP_LIBS)                 \
-       $(INTLLIBS)
-
-libgtkinspector_la_LDFLAGS =           \
-       $(LDFLAGS)
-
-templates =                            \
-       actions.ui                      \
-       classes-list.ui                 \
-       css-editor.ui                   \
-       data-list.ui                    \
-       general.ui                      \
-       menu.ui                         \
-       misc-info.ui                    \
-       object-hierarchy.ui             \
-       object-tree.ui                  \
-       prop-list.ui                    \
-       resource-list.ui                \
-       selector.ui                     \
-       signals-list.ui                 \
-       statistics.ui                   \
-       style-prop-list.ui              \
-       visual.ui                       \
-       window.ui
-
-template_headers = $(templates:.ui=.ui.h)
-
-%.ui.h : %.ui 
-       $(AM_V_GEN) $(top_builddir)/util/extract-strings$(EXEEXT) $< > $@
-
-EXTRA_DIST +=                          \
-       inspector.gresource.xml         \
-       $(resource_files)               \
-       $(templates)
-
-MAINTAINERCLEANFILES =                 \
-       resources.c                     \
-       resources.h
-
-distclean-local:
-       if test $(srcdir) != .; then \
-         rm -f $(MAINTAINERCLEANFILES); \
-         rm -f $(template_headers); \
-       fi
-
-dist-hook: $(top_builddir)/build/win32/vs9/gtk-inspector.vcproj $(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj $(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj.filters
-
-$(top_builddir)/build/win32/vs9/gtk-inspector.vcproj: $(top_srcdir)/build/win32/vs9/gtk-inspector.vcprojin
-       for F in `echo $(libgtkinspector_la_SOURCES) | tr '/' '\\'`; do \
-               case $$F in \
-               *.c) echo '   <File RelativePath="..\..\..\gtk\inspector\'$$F'" />' \
-                    ;; \
-               esac; \
-       done >libgtk-inspector.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk-inspector.vcprojin >$@
-       rm libgtk-inspector.sourcefiles
-
-$(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj: $(top_srcdir)/build/win32/vs10/gtk-inspector.vcxprojin
-       for F in `echo $(libgtkinspector_la_SOURCES) | tr '/' '\\'`; do \
-               case $$F in \
-               *.c) echo '   <ClCompile Include="..\..\..\gtk\inspector\'$$F'" />' \
-                    ;; \
-               esac; \
-       done >libgtk-inspector.vs10.sourcefiles
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-inspector.vcxprojin >$@
-       rm libgtk-inspector.vs10.sourcefiles
-
-$(top_builddir)/build/win32/vs10/gtk-inspector.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gtk-inspector.vcxproj.filtersin
-       for F in `echo $(libgtkinspector_la_SOURCES) | tr '/' '\\'`; do \
-               case $$F in \
-               *.c) echo '   <ClCompile Include="..\..\..\gtk\inspector\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
-                    ;; \
-               esac; \
-       done >libgtk-inspector.vs10.sourcefiles.filters
-       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk-inspector.vcxproj.filtersin >$@
-       rm libgtk-inspector.vs10.sourcefiles.filters
-
--include $(top_srcdir)/git.mk

diff --git a/gtk/inspector/Makefile.inc b/gtk/inspector/Makefile.inc
new file mode 100644 (file)
index 0000000..5c966df
--- /dev/null
+++ b/gtk/inspector/Makefile.inc
@@ -0,0 +1,73 @@
+inspector_c_sources =                  \
+       inspector/action-editor.c       \
+       inspector/actions.c             \
+       inspector/cellrenderergraph.c   \
+       inspector/classes-list.c        \
+       inspector/css-editor.c          \
+       inspector/data-list.c           \
+       inspector/general.c             \
+       inspector/gestures.c            \
+       inspector/graphdata.c           \
+       inspector/init.c                \
+       inspector/inspect-button.c      \
+       inspector/menu.c                \
+       inspector/misc-info.c           \
+       inspector/object-hierarchy.c    \
+       inspector/object-tree.c         \
+       inspector/prop-editor.c         \
+       inspector/prop-list.c           \
+       inspector/resource-list.c       \
+       inspector/selector.c            \
+       inspector/signals-list.c        \
+       inspector/size-groups.c         \
+       inspector/statistics.c          \
+       inspector/style-prop-list.c     \
+       inspector/treewalk.c            \
+       inspector/visual.c              \
+       inspector/window.c
+
+inspector_h_sources =                  \
+       inspector/action-editor.h       \
+       inspector/actions.h             \
+       inspector/cellrenderergraph.h   \
+       inspector/classes-list.h        \
+       inspector/css-editor.h          \
+       inspector/data-list.h           \
+       inspector/general.h             \
+       inspector/gestures.h            \
+       inspector/graphdata.h           \
+       inspector/init.h                \
+       inspector/menu.h                \
+       inspector/misc-info.h           \
+       inspector/object-hierarchy.h    \
+       inspector/object-tree.h         \
+       inspector/prop-editor.h         \
+       inspector/prop-list.h           \
+       inspector/resource-list.h       \
+       inspector/selector.h            \
+       inspector/signals-list.h        \
+       inspector/size-groups.h         \
+       inspector/statistics.h          \
+       inspector/style-prop-list.h     \
+       inspector/treewalk.h            \
+       inspector/visual.h              \
+       inspector/window.h
+
+inspector_templates =                  \
+       inspector/actions.ui            \
+       inspector/classes-list.ui       \
+       inspector/css-editor.ui         \
+       inspector/data-list.ui          \
+       inspector/general.ui            \
+       inspector/menu.ui               \
+       inspector/misc-info.ui          \
+       inspector/object-hierarchy.ui   \
+       inspector/object-tree.ui        \
+       inspector/prop-list.ui          \
+       inspector/resource-list.ui      \
+       inspector/selector.ui           \
+       inspector/signals-list.ui       \
+       inspector/statistics.ui         \
+       inspector/style-prop-list.ui    \
+       inspector/visual.ui             \
+       inspector/window.ui

diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c
index aafbaec3b57fbda6a8a361e82cba83cb4551bab5..7899bcf09edce297532e778a4ec66f5b387a27c8 100644 (file)
--- a/gtk/inspector/actions.c
+++ b/gtk/inspector/actions.c
@@ -284,7 +284,7 @@ gtk_inspector_actions_class_init (GtkInspectorActionsClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/actions.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/actions.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorActions, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorActions, object_title);
   gtk_widget_class_bind_template_callback (widget_class, row_activated);

diff --git a/gtk/inspector/classes-list.c b/gtk/inspector/classes-list.c
index 04fe934f6fcc4898abc3432e08c45277cbfc0bac..73caa3952ec03f849d9380360446d7373720c3d1 100644 (file)
--- a/gtk/inspector/classes-list.c
+++ b/gtk/inspector/classes-list.c
@@ -317,7 +317,7 @@ gtk_inspector_classes_list_class_init (GtkInspectorClassesListClass *klass)
 
   object_class->finalize = gtk_inspector_classes_list_finalize;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/classes-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/classes-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorClassesList, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorClassesList, object_title);
   gtk_widget_class_bind_template_callback (widget_class, add_clicked);

diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c
index ce1d1a00df69005286369f17453fc0fef5bb45de..776b3ace891d73b7f67453ea2db77aefcce20645 100644 (file)
--- a/gtk/inspector/css-editor.c
+++ b/gtk/inspector/css-editor.c
@@ -439,7 +439,7 @@ gtk_inspector_css_editor_class_init (GtkInspectorCssEditorClass *klass)
       g_param_spec_boolean ("global", "Global", "Whether this editor changes the whole application or just the selected widget",
                             TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/css-editor.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/css-editor.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, text);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, view);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorCssEditor, disable_button);

diff --git a/gtk/inspector/data-list.c b/gtk/inspector/data-list.c
index 4b4b0dd88c96048b4a6160e311113108a1ef616f..188ed9940f9f59506bfed1f63e20d3aa18c01689 100644 (file)
--- a/gtk/inspector/data-list.c
+++ b/gtk/inspector/data-list.c
@@ -154,7 +154,7 @@ gtk_inspector_data_list_class_init (GtkInspectorDataListClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/data-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/data-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorDataList, view);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorDataList, object_title);
   gtk_widget_class_bind_template_callback (widget_class, toggle_show);

diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index c7c726f3a992ae5a6290e20fef16d6b0a9638a80..75365c313eeb4b69b1b519f0064a2cff1f19dea1 100644 (file)
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -348,7 +348,7 @@ gtk_inspector_general_class_init (GtkInspectorGeneralClass *klass)
 
   object_class->constructed = gtk_inspector_general_constructed;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/general.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/general.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, version_box);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, env_box);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gl_box);

diff --git a/gtk/inspector/init.c b/gtk/inspector/init.c
index 80b303dc2136e8127d60bc2e7b39c980b0e876ab..433fc8de5a1a1bab5e5c7b5ebe577964b923133e 100644 (file)
--- a/gtk/inspector/init.c
+++ b/gtk/inspector/init.c
@@ -38,7 +38,6 @@
 #include "object-tree.h"
 #include "prop-list.h"
 #include "resource-list.h"
-#include "resources.h"
 #include "selector.h"
 #include "signals-list.h"
 #include "size-groups.h"
@@ -50,8 +49,6 @@
 void
 gtk_inspector_init (void)
 {
-  gtk_inspector_register_resource ();
-
   g_type_ensure (GTK_TYPE_CELL_RENDERER_GRAPH);
   g_type_ensure (GTK_TYPE_GRAPH_DATA);
   g_type_ensure (GTK_TYPE_INSPECTOR_ACTIONS);

diff --git a/gtk/inspector/inspector.gresource.xml b/gtk/inspector/inspector.gresource.xml
deleted file mode 100644 (file)
index 931be2d..0000000
--- a/gtk/inspector/inspector.gresource.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gtk/inspector">
-    <file compressed="true">actions.ui</file>
-    <file compressed="true">classes-list.ui</file>
-    <file compressed="true">css-editor.ui</file>
-    <file compressed="true">data-list.ui</file>
-    <file compressed="true">general.ui</file>
-    <file compressed="true">menu.ui</file>
-    <file compressed="true">misc-info.ui</file>
-    <file compressed="true">object-hierarchy.ui</file>
-    <file compressed="true">object-tree.ui</file>
-    <file compressed="true">prop-list.ui</file>
-    <file compressed="true">selector.ui</file>
-    <file compressed="true">signals-list.ui</file>
-    <file compressed="true">statistics.ui</file>
-    <file compressed="true">style-prop-list.ui</file>
-    <file compressed="true">resource-list.ui</file>
-    <file compressed="true">visual.ui</file>
-    <file compressed="true">window.ui</file>
-    <file>logo.png</file>
-  </gresource>
-</gresources>

diff --git a/gtk/inspector/menu.c b/gtk/inspector/menu.c
index 7720fe429005c3b3f060f5d32c3fb1aed0aae2ad..6a9a9d2674d3a7682b42c30cd0a14d63575a2935 100644 (file)
--- a/gtk/inspector/menu.c
+++ b/gtk/inspector/menu.c
@@ -147,7 +147,7 @@ gtk_inspector_menu_class_init (GtkInspectorMenuClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/menu.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/menu.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMenu, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMenu, object_title);
 }

diff --git a/gtk/inspector/misc-info.c b/gtk/inspector/misc-info.c
index 2ba9388a83204395e5dc21448919247f8c7b7162..450269513ec01cef513ea4bec85e990d334eb64e 100644 (file)
--- a/gtk/inspector/misc-info.c
+++ b/gtk/inspector/misc-info.c
@@ -548,7 +548,7 @@ gtk_inspector_misc_info_class_init (GtkInspectorMiscInfoClass *klass)
       g_param_spec_object ("object-tree", "Object Tree", "Object tree",
                            GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/misc-info.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/misc-info.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, refcount_row);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, refcount);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, state_row);

diff --git a/gtk/inspector/object-hierarchy.c b/gtk/inspector/object-hierarchy.c
index fd26981231cc7f4b676d3dc39dfe144671907b4a..9c91c8bb61c37eee4efb815c0d9fc2857613e36d 100644 (file)
--- a/gtk/inspector/object-hierarchy.c
+++ b/gtk/inspector/object-hierarchy.c
@@ -57,7 +57,7 @@ gtk_inspector_object_hierarchy_class_init (GtkInspectorObjectHierarchyClass *kla
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/object-hierarchy.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/object-hierarchy.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorObjectHierarchy, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorObjectHierarchy, tree);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorObjectHierarchy, object_title);

diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index f8f1d2a3964bf131b5225641877b1a1267bd5d2e..ba7ab2f8d029ccd53395c1d94b1474b0afa83bf1 100644 (file)
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -480,7 +480,7 @@ gtk_inspector_object_tree_class_init (GtkInspectorObjectTreeClass *klass)
                     NULL,
                     G_TYPE_NONE, 1, G_TYPE_OBJECT);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/object-tree.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/object-tree.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorObjectTree, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorObjectTree, tree);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorObjectTree, object_column);

diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c
index 771ea9c836c77a32b5c639f7c43c1f90a44bba62..410eb6215fec3fe327e6d1d64c2f8cc29ec54934 100644 (file)
--- a/gtk/inspector/prop-list.c
+++ b/gtk/inspector/prop-list.c
@@ -363,7 +363,7 @@ gtk_inspector_prop_list_class_init (GtkInspectorPropListClass *klass)
       g_param_spec_boolean ("child-properties", "Child properties", "Child properties",
                             FALSE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/prop-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/prop-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, attribute_column);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorPropList, tree);

diff --git a/gtk/inspector/resource-list.c b/gtk/inspector/resource-list.c
index 5e3816fc72cd4ff6143a6a1337e6cd281da0e0c2..546fcec2cb12b75a6e1fd3cb44a883914dab14e0 100644 (file)
--- a/gtk/inspector/resource-list.c
+++ b/gtk/inspector/resource-list.c
@@ -668,7 +668,7 @@ gtk_inspector_resource_list_class_init (GtkInspectorResourceListClass *klass)
       g_param_spec_object ("buttons", NULL, NULL,
                            GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/resource-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/resource-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorResourceList, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorResourceList, buffer);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorResourceList, content);

diff --git a/gtk/inspector/selector.c b/gtk/inspector/selector.c
index ce8c763176df9a773748d5e5b4fe1d0416a6988f..e19f74ca9c15507ecd78ddc99ca672d24698b5b8 100644 (file)
--- a/gtk/inspector/selector.c
+++ b/gtk/inspector/selector.c
@@ -53,7 +53,7 @@ gtk_inspector_selector_class_init (GtkInspectorSelectorClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/selector.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/selector.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSelector, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSelector, tree);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSelector, object_title);

diff --git a/gtk/inspector/signals-list.c b/gtk/inspector/signals-list.c
index 83e9d539c4d17c7a42d963a3e1c2f0b10f3df795..9cfdc8422735f16954eb8477c2461bad729c34c5 100644 (file)
--- a/gtk/inspector/signals-list.c
+++ b/gtk/inspector/signals-list.c
@@ -342,7 +342,7 @@ gtk_inspector_signals_list_class_init (GtkInspectorSignalsListClass *klass)
 {
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/signals-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/signals-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, view);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, text);

diff --git a/gtk/inspector/statistics.c b/gtk/inspector/statistics.c
index 34eb3fe22097b170a266afcd7ce2d72befce973b..fe33d18f03698fadfdb12aba04ee379a52a85a9a 100644 (file)
--- a/gtk/inspector/statistics.c
+++ b/gtk/inspector/statistics.c
@@ -438,7 +438,7 @@ gtk_inspector_statistics_class_init (GtkInspectorStatisticsClass *klass)
       g_param_spec_object ("button", NULL, NULL,
                            GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/statistics.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/statistics.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, view);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, stack);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStatistics, model);

diff --git a/gtk/inspector/style-prop-list.c b/gtk/inspector/style-prop-list.c
index 536661a00917e428dbf5d8e15a42bdb6b543b775..9faa31a75a76dd85e677966d414181cd9442b5af 100644 (file)
--- a/gtk/inspector/style-prop-list.c
+++ b/gtk/inspector/style-prop-list.c
@@ -276,7 +276,7 @@ gtk_inspector_style_prop_list_class_init (GtkInspectorStylePropListClass *klass)
 
   object_class->finalize = finalize;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/style-prop-list.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/style-prop-list.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStylePropList, model);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStylePropList, tree);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorStylePropList, search_stack);

diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index cd67d14c1eb6d968fabafc036308fbf68677d9cd..68d310b48778be306370696dcf523f6a141a0e57 100644 (file)
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -630,7 +630,7 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass)
 
   object_class->constructed = gtk_inspector_visual_constructed;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/visual.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/visual.ui");
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, rendering_mode_combo);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, updates_switch);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, direction_combo);

diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index 79b1cb60d6098063eff981aff34cfdef69fd83a7..5892ca5b3e1bc45146dc023953e7187349cba998 100644 (file)
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -152,7 +152,7 @@ gtk_inspector_window_class_init (GtkInspectorWindowClass *klass)
 
   object_class->constructed = gtk_inspector_window_constructed;
 
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/inspector/window.ui");
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/window.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, top_stack);
   gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, object_stack);

diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index 9752614413e4eb798b7859d77f806d8ba88a87fb..7e4ea7e967ece6b95ee459a2308bd2932c66722d 100644 (file)
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -3,7 +3,7 @@
   <template class="GtkInspectorWindow" parent="GtkWindow">
     <property name="default-height">500</property>
     <property name="default-width">800</property>
-    <property name="icon">resource:///org/gtk/inspector/logo.png</property>
+    <property name="icon">resource:///org/gtk/libgtk/inspector/logo.png</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <property name="visible">True</property>